Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Port infrastructure improvements from master to dev/release/2.0.0 #7721

Merged
merged 39 commits into from
Sep 29, 2017
Merged

Port infrastructure improvements from master to dev/release/2.0.0 #7721

merged 39 commits into from
Sep 29, 2017

Conversation

nguerrera
Copy link
Contributor

@nguerrera nguerrera commented Sep 28, 2017 •
edited
Loading

Porting the following to the new 2.0.x infrastructure branch from master:

#7352 Update solution to reflect current state
#7530 Eliminate warnings (just that subset, not the part of the PR that updated core-setup)
#7460 Use REST API to upload to feed
#7571 Logging for feed upload
#7522 Rearrange output folders to fix incremental build
#7594 Fix signing after output folders moved

davkean and others added 30 commits September 27, 2017 13:19
@davkean @nguerrera
Let VS update solution with current state
14e4ff5 
(cherry picked from commit 4c8c137)
@davkean @nguerrera
Remove non-existent projects
8d8fb51 
(cherry picked from commit 3c81474)
@davkean @nguerrera
Add MSBuildSdkResolver to the sln
88ceffe 
Fixes: https://github.com/dotnet/cli/issues/7351.
(cherry picked from commit 369b893)
@davkean @nguerrera
Move projects to virtual foldes
92f727c 
Move tool_fsc to src
Move dotnet-help.Tests to test

(cherry picked from commit f00adb1)
@nguerrera
Port dotnet#7352 (Update solution to reflect current state) from mast…
43a3c54 
…er to 2.0.x
@nguerrera
Use fixed RTM build of PlatformAbstractions from build project
87268c5 
(cherry picked from commit 0a1be24)
@nguerrera
Use $(CliTargetFramework), eliminate warnings, treat warnings as errors
138b98f 
(cherry picked from commit 656eab7)
@nguerrera
Fix warnings in test projects
6fad8be
@nguerrera
Port warning elimination from #7350 from master -> 2.0.x
1f21ad0
@nguerrera
Port dotnet#7460 from master to 2.0.x
c834676 
Use Rest Api to upload to the feed

Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script

(cherry picked from commit 7f54ccb)
@nguerrera
Port dotnet#7571 from master to 2.0.x
36ee426 
Add log to UploadToLinuxPackageRepository

(cherry picked from commit 8b8aef7)
@dsplaisted @nguerrera
Move dir.props to auto-imported Directory.Build.props
8385d37 
This is necessary for setting the intermediate output path to work correctly

(cherry picked from commit ae0aa8e)
@dsplaisted @nguerrera
Support new artifacts layout in tests and other build logic
2b134c9 
(cherry picked from commit 13da213)
@dsplaisted @nguerrera
Use separate folders for different cases of a theory
db1dabc 
(cherry picked from commit 4ccf1b6)
@dsplaisted @nguerrera
Show path when directory delete fails in test setup
dd4a1b5 
(cherry picked from commit 61e68e6)
@dsplaisted @nguerrera
Copy empty Directory.Build.props to artifacts folder during build ins…
ee7852a 
…tead of checking it in

(cherry picked from commit 884a483)
@dsplaisted @nguerrera
Generate properties to pass to the next stage of the build
f393157 
(cherry picked from commit 12f8c23)
@dsplaisted @nguerrera
Update expected SDK version test to work with multiple stages
c665fd3 
(cherry picked from commit e4777c0)
@dsplaisted @nguerrera
Rename Stage0 build variables to PreviousStage
ca34332 
(cherry picked from commit c6e4c8f)
@dsplaisted @nguerrera
Update MSI tests to use new output directory layout
ca21dee 
(cherry picked from commit 2222290)
@dsplaisted @nguerrera
Fix DotNetRestore after merging upstream changes
b0c4508 
(cherry picked from commit fc6f2f3)
@dsplaisted @nguerrera
Use shorter output paths to avoid max path issues on Windows
4cd03dc 
For example, "out/2" instead of "artifacts/stage2"

(cherry picked from commit dcb3a7a)
@dsplaisted @nguerrera
Fix test asset that had NuGet.Config pointing to incorrect directory
21b9a5f 
(cherry picked from commit 103b8a6)
@dsplaisted @nguerrera
Fix multiple tests using same output path
7b2eb66 
(cherry picked from commit 9fb5f74)
@dsplaisted @nguerrera
Fix test assets with NuGet.Config files pointing to old layout
dfe1f69 
(cherry picked from commit fd66cdc)
@dsplaisted @nguerrera
Use a shorter path for test working directories, get rid of Stage 0 p…
9f3bbc4 
…roject.json based CLI

(cherry picked from commit 4c3b13e)
@dsplaisted @nguerrera
Fix debian package generation
e60fe42 
Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored.  This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties.  So this change restores it in-place instead.

(cherry picked from commit ac67434)
@dsplaisted @nguerrera
Delete outdated comment
02a07e6 
(cherry picked from commit 546eff2)
@dsplaisted @nguerrera
Fix test that depended on old output directory layout
78eb0a7 
(cherry picked from commit 27dc803)
@dsplaisted @nguerrera
Rename output folder from out to bin
65b0df5 
(cherry picked from commit 97b7553)
@nguerrera
Port dotnet#7594 from master to 2.0.x
a652e6a 
Avoid importing incompatible .props files for signing build
@nguerrera nguerrera requested review from livarcocc and a team September 28, 2017 00:01
@nguerrera nguerrera closed this Sep 28, 2017
@nguerrera nguerrera reopened this Sep 28, 2017
@nguerrera
Copy link
Contributor Author

@mmitche is there a delay before newly added branches trigger ci?

@mmitche
Copy link
Member

mmitche commented Sep 28, 2017

@dotnet-bot test this please

@mmitche
Copy link
Member

mmitche commented Sep 28, 2017

@nguerrera Good question...checking.

@mmitche
Copy link
Member

mmitche commented Sep 28, 2017

@dotnet-bot test this please

@mmitche mmitche closed this Sep 28, 2017
@mmitche mmitche reopened this Sep 28, 2017
@mmitche
Copy link
Member

mmitche commented Sep 28, 2017

@nguerrera Looks like just a configuration error post-upgrade. Should trigger in a couple

@mmitche
Copy link
Member

mmitche commented Sep 28, 2017

@dotnet-bot test this please

@mmitche mmitche closed this Sep 28, 2017
@mmitche mmitche reopened this Sep 28, 2017
@nguerrera nguerrera closed this Sep 28, 2017
@nguerrera nguerrera reopened this Sep 28, 2017
@mmitche
Copy link
Member

mmitche commented Sep 29, 2017

@dotnet-bot test this please

@livarcocc
Copy link

@dotnet-bot Test Windows_NT x86 Debug Build

livarcocc
livarcocc reviewed Sep 29, 2017
View reviewed changes
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
<!-- This dependency was added due to an issue in restore where a lower version of this package coming from nuget.commandline.xplat
led to an error. This is tracked as NuGet issue : https://github.com/NuGet/Home/issues/4213 -->
<PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" />

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@livarcocc
Copy link

@mmitche

Time Elapsed 00:21:47.54
11:47:19 [xUnit] [INFO] - Starting to record.
11:47:19 [xUnit] [INFO] - Processing MSTest-Version N/A (default)
11:47:24 [xUnit] [INFO] - [MSTest-Version N/A (default)] - 32 test report file(s) were found with the pattern '**/*.trx' relative to 'D:\j\workspace\debug_windows---bb0a5091' for the testing framework 'MSTest-Version N/A (default)'.
11:47:50 [xUnit] [INFO] - Check 'Failed Tests' threshold.
11:47:50 [xUnit] [INFO] - Check 'Skipped Tests' threshold.
11:47:50 [xUnit] [INFO] - Setting the build status to SUCCESS
11:47:50 [xUnit] [INFO] - Stopping recording.
11:47:50 Notifying endpoint with url 'helix-int-notification-url'
11:47:50 ERROR: Failed to notify endpoint with url 'helix-int-notification-url'
11:47:50 java.net.MalformedURLException: no protocol: helix-int-notification-url
11:47:50 	at java.net.URL.<init>(URL.java:593)
11:47:50 	at java.net.URL.<init>(URL.java:490)
11:47:50 	at java.net.URL.<init>(URL.java:439)
11:47:50 	at com.tikal.hudson.plugins.notification.Protocol$3.send(Protocol.java:53)
11:47:50 	at com.tikal.hudson.plugins.notification.Phase.handle(Phase.java:66)
11:47:50 	at com.tikal.hudson.plugins.notification.JobListener.onCompleted(JobListener.java:39)
11:47:50 	at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:211)
11:47:50 	at hudson.model.Run.execute(Run.java:1782)
11:47:50 	at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
11:47:50 	at hudson.model.ResourceController.execute(ResourceController.java:97)
11:47:50 	at hudson.model.Executor.run(Executor.java:419)
11:47:50 Failed to notify endpoint with url 'helix-int-notification-url' - java.net.MalformedURLException: no protocol: helix-int-notification-url
11:47:50 Notifying endpoint with url 'helix-prod-notification-url'
11:47:50 ERROR: Failed to notify endpoint with url 'helix-prod-notification-url'
11:47:50 java.net.MalformedURLException: no protocol: helix-prod-notification-url
11:47:50 	at java.net.URL.<init>(URL.java:593)
11:47:50 	at java.net.URL.<init>(URL.java:490)
11:47:50 	at java.net.URL.<init>(URL.java:439)
11:47:50 	at com.tikal.hudson.plugins.notification.Protocol$3.send(Protocol.java:53)
11:47:50 	at com.tikal.hudson.plugins.notification.Phase.handle(Phase.java:66)
11:47:50 	at com.tikal.hudson.plugins.notification.JobListener.onCompleted(JobListener.java:39)
11:47:50 	at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:211)
11:47:50 	at hudson.model.Run.execute(Run.java:1782)
11:47:50 	at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
11:47:50 	at hudson.model.ResourceController.execute(ResourceController.java:97)
11:47:50 	at hudson.model.Executor.run(Executor.java:419)
11:47:50 Failed to notify endpoint with url 'helix-prod-notification-url' - java.net.MalformedURLException: no protocol: helix-prod-notification-url
11:47:50 Notifying endpoint with url 'legacy-notification-url'
11:47:50 ERROR: Failed to notify endpoint with url 'legacy-notification-url'
11:47:50 java.net.MalformedURLException: no protocol: legacy-notification-url
11:47:50 	at java.net.URL.<init>(URL.java:593)
11:47:50 	at java.net.URL.<init>(URL.java:490)
11:47:50 	at java.net.URL.<init>(URL.java:439)
11:47:50 	at com.tikal.hudson.plugins.notification.Protocol$3.send(Protocol.java:53)
11:47:50 	at com.tikal.hudson.plugins.notification.Phase.handle(Phase.java:66)
11:47:50 	at com.tikal.hudson.plugins.notification.JobListener.onCompleted(JobListener.java:39)
11:47:50 	at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:211)
11:47:50 	at hudson.model.Run.execute(Run.java:1782)
11:47:50 	at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
11:47:50 	at hudson.model.ResourceController.execute(ResourceController.java:97)
11:47:50 	at hudson.model.Executor.run(Executor.java:419)
11:47:50 Failed to notify endpoint with url 'legacy-notification-url' - java.net.MalformedURLException: no protocol: legacy-notification-url
11:47:50 Setting status of a652e6a4fd6733a69b0bd8c99e55372ff1be0974 to SUCCESS with url

@mmitche
Copy link
Member

mmitche commented Sep 29, 2017

@livarcocc Please ignore those errors for now.

@nguerrera nguerrera merged commit d2cda77 into dotnet:dev/release/2.0.0 Sep 29, 2017
@nguerrera nguerrera deleted the infra-port branch September 29, 2017 20:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@livarcocc livarcocc livarcocc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nguerrera @mmitche @livarcocc @dnfclas @davkean @dsplaisted